patch #9 applies and lgtm as the changes are as mentioned in the ticket.