[ci skip]

This is a follow up to #12609 and integrates #12158.

Thanks @aspiers.
Closes #12158.

Conflicts:
	guides/source/action_controller_overview.md