L5: Rebase g2-common over cm-12.0 with a few improvements & adjustments