#time 30m #comment HC-633 - Fixed tab and line issues