Node doesn't shutdown gracefully during block import

[s1na]

System information

Geth version: geth version v1.15.6
CL client & version: e.g. lighthouse/nimbus/[email protected]
OS & Version: Windows/Linux/OSX
Commit hash : (if develop)

Expected behaviour

Node shuts down gracefully on ctrl+c

Actual behaviour

INFO [03-27|17:26:00.331] Imported new chain segment               number=8998  hash=a9ee42..af8559 blocks=109 txs=837  mgas=2087.455 elapsed=8.045s      mgasps=259.468 age=1w1d19h snapdiffs=2.49MiB   triedirty=169.78MiB
INFO [03-27|17:26:08.384] Imported new chain segment               number=9107  hash=0486b7..d5cac1 blocks=109 txs=834  mgas=2074.864 elapsed=8.053s      mgasps=257.650 age=1w1d19h snapdiffs=2.56MiB   triedirty=169.74MiB
^CINFO [03-27|17:26:12.630] Got interrupt, shutting down...
INFO [03-27|17:26:12.630] HTTP server stopped                      endpoint=127.0.0.1:8545
INFO [03-27|17:26:12.630] HTTP server stopped                      endpoint=127.0.0.1:8551
INFO [03-27|17:26:12.630] IPC endpoint closed                      url=/home/ubuntu/datadir-hoodi/geth.ipc
INFO [03-27|17:26:16.466] Imported new chain segment               number=9222  hash=bd6fbd..58e400 blocks=115 txs=924  mgas=2157.052 elapsed=8.082s      mgasps=266.876 age=1w1d18h snapdiffs=2.65MiB   triedirty=170.03MiB

[rjl493456442]

I guess the interruption signal is only handled after processing a batch of blocks, which takes time.
We could somehow propagate the signal into the chain insertion to solve it.