BRANCH:SP-1150: checked for boolean False