Merge remote-tracking branch 'upstream/development' into diff-iterator