FALCON-123 Improve build speeds in falcon. Contributed by Srikanth Sundarrajan