first commit in master-patch1