Patch 2

BS3 commits: abad169f4beff8f2ee1f49074eb2df82f477b5db