Merge latest changes from lbl-srg repository.