Merge "Bug 6936 - Fix post request"