!23 had too many changes that did not address the Drupal standard for me to rebase so I created a new branch to contain the changes. I may not have gotten all of them so we'll see how many surface.
Closes #3409106