Merge "Fix issue with resting stack position." into rvc-dev