Merge branch 'refs/heads/master' into release
An update to send 204 json response without a  body as it might break some clients
Merge branch 'refs/heads/release'