Merge "Fix crash & history text" into rvc-dev