LGTM, thanks!
Please coordinate with @huixie90 due to the merge conflicts with D142494. Can you make sure both patches are backported to the release branch?
Please verify whether I suggested the proper syntax.
I'm going to abandon this revision in favor of D142494 and D142520. Sorry about the confusion. The end result will look similar to this revision (for the release notes).
Please verify whether I suggested the proper syntax.