Fixes for OOIION-685: Policy changes for 2.0