Merge branch 'fix/gun-limiter' into 'develop'