Updated patch that takes Juri comments into account.