[Jason, Chris] merge progress