Backporting to 0.5.1