Merge "Use namespace instead of macro for array overriding"