Preparing for a merge of the cleanup branch.