Merge branch 'fix/hackney-global-options' into 'develop'