Updating Condition Stubs to match new requirements.
Merge