Build 2151

Reviewing is disabled because there’s a newer build on wip/sergeigarin/enable-conflicts-dialog. Review build 2192