removed unnecessary if statements.
Merge branch 'master' into SD-1197