[4.9] Security fixes