PB-649 #comment event handling added.