Additional changes to 12275 and 12292

BS3 commits: 2a75e559f64bf536423cbf63bce433cdfb2f9976