Merge "Improve and highlight logging to console"