schemes getter/setter
Merge branch 'feature/2.2.0' into feature/2.4.0