Merge branch 'develop' into fix-css-26