Merge "Add extra logging"