This MR pulls in changes from a patch file, adds some spaces and updates the syntax to be a bit more modern.
Closes #3334879