Merge "Add exception for tbr instances"