[BUG #5965] taking over formatter_3 from master to fix this