I've modified #14985 by @adnelson to take into account the update in b68f09a520371dd53fd1ab370935a2d8001700b3