FEND-701: partial fix to FEND-701:Handle comments/annotations with long input