Uplift to 0.5.2 / 0.7.2.