Catchup on chenyuan branch