Merge remote-tracking branch 'origin/master' into feature/8209_icat_datetime_fix
Improve index being sorted. Refs #8209.
Merge branch 'feature/8209_icat_datetime_fix' into develop