Upstream updates including form fixes