Merge branch 'master' into Dustin
Asset protection interface changes
Merge branch 'Dustin'