Created by: JLHwung
Fixes #10636 (closed)
I am not familiar with the codebase, let me know I misses something. Thanks!