Backports 0.8