Merge branch 'hotfix/fix_some_errors'
update
Merge branch 'hotfix/minor_css_edit' into develop