ConnectionHandler changed to abstract class;
Merge remote-tracking branch 'origin/master'