Co-authored-by: Qstick <qstick@gmail.com>
Fixes #4066 Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>