backport fix for bnc#901597 to SLE12-GA and then merge branch back