Forward-port eaf451f10e236691ad70621793c24ecf7b5e4065 (fix entries grouping if they follow an ignored entry) to master