Update 1.6.1 branch