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