Include the contents of the rethrown exception error message in the new exception error message.
In parts of code that use CTL, write using CTL-style coding indentation and line breaks.
Merge branch 'feature/Indentation_cleanup' into ctl_1.5_rc