Fixed error in Condition
Merge branch 'master' into UnitTests
Unit Test for Manual Provider