Merge "Avoid gcc version check"