Fix build after mass merge of hardened/current/master