Complete the merge of commit f885aa9