Integrates changes from ClemMakesApps' commit:
8581e152, although it was reverted to avoid frustrating conflicts.

See MR: !5530 (diffs)