Prepared for 1.2.3 update.
Merge branch 'develop'