Upgrade guzzle
Merge remote-tracking branch 'origin/develop' into upgrade_guzzle
Merge remote-tracking branch 'origin/upgrade_guzzle' into develop