Michal, this has been fixed for 13.2 according to boo#911577. Is there a chance that this fix also gets made available for 13.1 as well?