Merge branch 'pending-l2x0' into cache