Merge "Added logging to pinpoint source of bug"