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