Merge "SF: Compile with -Wextra"