Merge "config: Compilation fix"