Merge "Add guards around unbind" into sc-dev