Merge branch 'release/1.3.0' into develop
Manually copied styles
Merge branch 'hotfix/1.3.1' into develop
manually merged hotfix and head
Merge branch 'develop'