FEND-701:Handle comments/annotations with long input