Closes #14405. This is a follow-up to 9e997e90 to restore the documented behavior. Conflicts: actionview/CHANGELOG.md