Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop
Fixes: #2363 remove the update schema from 1.0.4 for 1.0.6