Merge "New log format, Manual log generation, plus logging of invalidates"