Merge "Revert "Fix code for more restrictive compiler [options]""