Merge branch '1876_sigint_signal_handling'