Merge branch 'security/follow-always-async' into 'develop'