So we can cherry pick contrib updates easier in the future (needed by !6102 (merged)).
Also includes:
And from 4.0: