Merge "Add a compile time condition to remove unnecessary code"