Merge "Add unbind if bind call returns false" into tm-dev