Merge "changes done to get stack trace of exception"