Merged changes + some optimizations (including all the PreparationManager stuff)