Merge "Disable DEBUG flag by default"