Merge branch 'develop'
Mark as 2.5.3