Important security update (18/19)

Important security update