Merge branch 'mm-bug-hunt'
Merge branch 'master' of https://github.com/amida-tech/DRE-UX