BT-21/OSNG-266

This PR is not ready to be merged yet.