Merge branch 'develop' into issues/548-first-launch-ui