Merge "Share pack historical sorting using wrong keys." into klp-dev