Backported L2 improvements to L1, changed Labels