super minor 8.2.5 version history item edit #4732
minor 8.2.5 version history item edit #4731
minor 8.2.5 version history item edit #4739
Merge branch 'V8_2-branch' into V8_3_2-branch