New hardened build support (coming) in F16