Merge "Fix issue with history deletion" into rvc-dev am: aec73f13 am: a1cedb34 am: ef4c32da am: e6b9c81e Change-Id: Ie8e84810b817bf4f0ebcc1dccc061cde60c742a8