Merge "Update history flow" into rvc-dev