After merge from v1r18p20050901 fixes - see CL 282
Changeset view not shown, since the total size (12.0 MB) exceeds 9.5 MB