Note 21674, post commit