Queued module saves now pass save parameter.
Merging with develop