Merge "DO NOT MERGE Local timeout should cancel remote work" into rvc-qpr-dev