Proposal: We propose to add the following change to the base CR