FIX stop overriding makepersistence
Merge from '135-persistence' into integration