Fixing match errors introduced by handling of include
Merge remote-tracking branch 'upstream/master'
Minor changes