Merge "Protect against assumptions of a top focused stack." into rvc-dev