Merge remote-tracking branch 'origin/dev' into newtheme
added fix
Merge remote branch 'origin/newtheme' into dev