Catch up the quarnster repo changes.

Resolved merge conflicts.