AFAICT from manual testing the issue is fixed. The openQA test still fails though. I think it needs adjustments.