Merge remote-tracking branch 'google/feature/#80-configurable-include-path' into develop