Merge "Remove 2 false values returned in execute()"