Merge branch 'pr/14801'

BS3 commits: 38217ee405de65a3fd3e2c217f8d5be8563da327