Patch #1307806: Use project defaults where possible
14 files changed