refs #1888 - Synced with production settings
Merge pull request #3 from cristiroma/1888_features2disk

refs #1888 - Synced with production settings - Tested on all instances.