Note to reviewer
This MR is based on Nanley's MR !2282 (closed), so please review patches authored by me.
I have tested changes on previous Gen and there is no regression. For Gen 12, I have tested patches internally, but as my series is based on other MR, I will re-run my changes once those MR lands.