Merge "Fix for bug 5115066 Handler override of toString() hides derived class name"