Fixes merged into qa_test_klp upstream (https://github.com/lpechacek/qa_test_klp/commit/6629a3463c2ae36dc7303963bcae5c5fbe853678).