Try to limit wall of text with derivative messages
Rename session array to be more generic
Merge pull request #421 from mitchmac/7.x

Try to limit wall of text with derivative messages