Merge branch 'security/remote-follow-commonapi' into 'develop'