Merge branch 'r/1.0.17' into develop
Merge branch 'master' into develop
Revert theme key change in bb723d4. In need up upgrade script.
Version bump
Merge branch 'r/1.0.18'