Created by: denizdogan
Fixes #10970 (closed).
@4brunu if you find the time to look at this PR, I'd highly appreciate it.