merge mlfryman branch to dev

repo clean up