Reduced memory requirements
Improvements for running within jenkins