Merge branch 'dev' into desktop-poilsh-styles-ui-ux