Merge "Removing extra string creation for log" into main