[ARQ-1300] Improved comments handling by introducing regex.