Created by: ianschmitz
Fixes #8680 (closed).
Thanks to @hzoo @nicolo-ribaudo and @existentialism for their quick help!