Merge "[multi-part] Enable bidirectional sorting" into nyc-andromeda-dev