Merge branch 'limiter-setup-fix' into 'develop'