Created by: BarneyGumball
The merge referencing #11465 (closed) is mislabelled. It actually fixes #11659 (closed)