Third phase of performance improvement. - Added javadoc comment. - Fixed the type of properties. PR: 31699