Fixed 2824: Support for logging