Added enqueueToEndpoint method
Minor cleanups in the listener
Merge remote-tracking branch 'origin/master'
Minor updates