Merge branch 'develop' into fix/deprecation-warning-welcome-message