Committing merge from trunk into branches/apreq-multipart