Merge "A reference to the psi section data could become invalid if more"