Code clean-ups + added if to only execute some logic in case of includeAll is falsy.
Merge remote-tracking branch 'origin/0.3' into 0.3