Created by: ffoodd
Fixes #30837 (closed)
Simple PR to try this out. Should probably be backported to v4 if merged.