Merge "Allow Condition Providers to bind/unbind themselves"