compatible versions cms
Merge branch 'issue-177' into develop