Second-round review of bigmerge-new branch