Apply rev. 39918 changes to CS