fixes: #14033 fixes: #17726 closes: #17729 Signed-off-by: Rob B <github@0x7e.net> Signed-off-by: Christian Brabandt <cb@256bit.org>