Edit by shlain for conflict
Merge branch 'master' of https://github.com/manuviswam/hifx_test