PR: 249375 Submitted by: Denis Kasak <dkasak@termina.org.uk> Submitted by: Sascha Biberhofer <ports@skyforge.at> (earlier version)