log message changed to 12:4x
merge fix