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