The remaining validation test failures on the stable branch will be
fixed by pending merged.