Merge branch 'cherry-pick-5e552f2f' into 'stable/kali'