Merge "Fix 'history' text" into rvc-dev