OOIION-1396: Fix to aggregate status persistence