Merge "Build fix with config internal stats"