Changes between #380 and #386

No builds.