Merge "Allow third party condition providers."