Add short circuiting to instruction execution.
Merge branch 'generic-short-circuit'