Merge "Fix logging messages not being formatted correctly"