Marking as done as the patch has been pushed to master.