Merge pull request #9931 from mshabunin:bss-cleanup