[IMP-dev] Please make sure you clean up commits before pushing to github/develop