Brought in the latest sorted-collection changes and updated build.