see #8465 - use diamond operator where applicable
Changeset view not shown, since the total size (11.4 MB) exceeds 9.5 MB