CMK 2.1 - "Activating changes" significantly slower than in all previous releases

[bitwiz]

FWIW, we’re not using the password store at all.