Process feedback from upstream
Also implement before[Line|Block]Comment