Merge branch 'develop' into develop-cxf