Major Thinning of Junk
Remerge of DEV to master