shutdown task not triggered on gnunet-arm -e

When running the service with gnunet-arm -i svc, the function added with
GNUNET_SCHEDULER_add_shutdown is not being run when issuing gnunet-arm -k
svc

If I add a sigterm handler and do GNUNET_SCHEDULER_shutdown there, it
hangs and I have to sigint (and it doesnt halt).

If I run the service directly (without gnunet-arm) the shutdown task
gets triggered.

Is this expected behavior?

Is there a recommended way to add teardown code when using gnunet-arm?

I'm on 1567c9472b917a097cace08a7b08fc724e14f381

thanks,
l

-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEWahEpISsESU9Oj6dzcvSTdHQ4AEFAmNY7L0ACgkQzcvSTdHQ
4AEG6Af/dPGs6Bj+EfQssi8so2ALNwnZsxtECt7l0cIyY6x0KfhcLEhgXtFRMT5l
yS0L8oPaz5kw8W6mpvxM5qiPlwiwHt9vqlqJcOY0tht1f0+/8G+UbXEd187bdHE8
IuzAeTUKw2vBHrhr53daLUiC02seq6QcfeHwVJZovMB1T/K3m8nHNKw2akk9zjUy
mJuURDT3wSzGhKf5YxHSjnSbtVj2mYESzUXEpNe6Iu6+8urYgeAIy+n1adkDsjyZ
4xnMSyfg4XeVD5RgvuOXltOpT3oJMZ+DyJHyJtXvcaRzhxxRJh7LUC+n8Pe831yT
MGAXyJbzMvx9nBmtjahL7Hv5fEQVsQ==
=Y7Wz
-----END PGP SIGNATURE-----