Merge "Don't create new leash if there is pending position" into main