Merge branch 'add-condition'