This is now working for Add/Del persist and non-persist