SOS-1889 Use generic classPK as identifier
SOS-1889 Upgrade process for notifications