i back ported four commits into 5.1 branch. 56e558a6242d033c8372ce6559578339795d940c 3ba84422d02d21e88d18b7bc7b70d3061d532f11 41316c29677b6a6eac25bda6383f72905a4a32bc 863a91854eb65c8b5bc49ef62f01dcf9a8b586d0
And regenerated RPMs on OBS.
Please make test on clean VM. If issue exist please reopen.