@Michal, if you are ok with this patch, please apply to Leap 15.1, stable and master branches, please.