moved stuff to/from Common
Merge branch 'master' into reassemble
Merging changes to Common into reassemble