Merge "Make javelin check logging a bit better"