Merged console fixes in