Use a known path so we can sed it for building.
Merge branch 'dev' into features/no-messageHolder