Pull changes from nextgen_console_log_fix into nextgen.