Update 2 from Jianing
Fix merge conflicts