Merge "overlay: overlay the overlay with moar overlays" into cm-11.0