Add support for extend inside of condition
Merge remote-tracking branch 'upstream/master'