Merge "Don't upsert a db row for FUSE create" into rvc-dev