If you are so inspired, it would be helpful to include example usage. I guess that may come with things like describing the upgrade path for #21169 though.