Sync Back Malformed Pull

Sync back changes from #321 to `dev` (should not have gone to master).