Merge "Remove scanFile after create" into rvc-dev