Merged "Underp an ifdef"