PASDK-663: Code changes for new design solving OAR init issue