Bug fix for sort.
Modified parameterization for expansion job.
Merge branch 'qc-codelab' of github.com:deflaux/codelabs into qc-codelab