Merge "Add misc logging:"