merge

Seyren webapp shutdown stuck on CheckScheduler.executor's non terminated thread