Merge multiple backported vulnerability fixes