merge master to 1.6