L5 Start: Rebase g2-common over cm-12.0 with few improvements & fixes