Merge branch 'develop' into 0004-themes_settings
Batch continue
Merge branch '0004-themes_settings' into develop