Improved keying for cookie alerts.
Merge remote-tracking branch 'dma/develop' into newmods