Merge "Looking for occluding activity above" into rvc-dev