Merge "Fix white space errors + remove #if defined" into integration