Merge pull request #12861 from Tithen-Firion/cbsinteractive-fix