handling of MO style override
Merge branch 'develop' into 'feature/annotations_refactor'