Merge branch 'hotfix/ackrc' into develop
Merge branch 'develop'