new heading 'Revision History'
N3985
Merge with upstream