This is done
Merge branch 'develop' into release_branches/1.0.3