Merge branch 'feature/update-welcome-setting-in-description' into 'develop'