Update for v0.5.2 from rev cb8820e