Merge branch 'hotfix/hf1'
Merge branch 'release/v0.6.8'
ackrc - json
Merge branch 'release/v0.6.9'
bugfix