Chris branch merged