Merge remote-tracking branch 'upstream/develop' into develop-dh-date-range