Merge "Fix history task stack" into rvc-dev