Branched from master into transactional-add.