Added shutdownNow and updated PR. No reference to ISPN-2477 yet as that one is still not fully solved.