Added template guesser logic within kernel.controller listener.
Merge remote-tracking branch 'origin/master'