Merge remote branch 'origin/machine-common-codes' into charm