Migrate modernize encryption service (#6830)