fix including unwanted files
Merge remote-tracking branch 'origin/branch-32' into branch-32