Remove maps from build path.
Merge remote-tracking branch 'origin/develop'