Bypassing CI and approval because 0.21 is currently blocking the builder.
mentioned in merge request !80045 (closed)