Merge branch 'fix/apc2s-limits' into 'develop'