PR: 55666 Submitted by: Ports Fury
PR: 44376 Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>