Merge "Handle malnamed files in history dir" into rvc-dev