PR: 194520 Submitted by: Hans Fredrik Nordhaug <hans@nordhaug.priv.no> Approved by: mentors (implicit)