Rebase against 9f704e4cc4a346d249ebc5346975e2d181cc46d1. Force rebase against id, as patch was acciendly merge in previous commit.