Backporting for 1.8