CMS-3504 Implement generic conversion classes.
Merge branch 'master' into srs-refactoring