Merge "use different log.h header file" into main