Merge "Fix issue with history deletion" into rvc-dev