cms fixes
Merge branch 'release/1.4.0'