Additional changes from failed merge

Attempted with Posh Git

git checkout sharlikran-falloutnv-support
git merge sharlikran-falloutnv-soun-mset-fix
git checkout sharlikran-falloutnv-soun-mset-fix