Changes between #331 and #338

No changes in any of the builds.