[akmods: 2/3] Merge commit 'b190585b8c3ea9e8b5dcff8289ce69c11bf80604' into el7