Merge of 2.0-maint to prep landing autocommit