code clean up using Prefer: return-content
Merge remote-tracking branch 'origin/master'