LPS-42667 Add BSH support