Merge branch 'exception_code_msg' into exception_hierarchy