Add overlay[local] annotations
#21116
+423
−85
Draft