Merge branch 'hotfix/ackrc'
Merge branch 'develop'
ackrc config fix