Merge branch 'refs/heads/t/signal_handler_improvement'