save_generated_block option, disable for big servers
Merge remote-tracking branch 'upstream/master' into next