Change in Schema, nested if condition bug fix. ticket CORE-5