Merge branch 'gun-replace-cast-with-call' into 'develop'