Initial commit of shared code
Merge remote branch 'mm/master'