Merge "Debug message fix"