Merge branch 'connect-src' into 'develop'