merged 239:240 to tag/0.4
This tag has no release notes.