Merge branch 'dev'
utils hk