Changes between #1319 and #1320

No changes in any of the builds.