Merge branch 'unknown_exception_handling' into 'ibm-trunk'