Merge branch 'hotfix/hackney-1.15.2' into 'develop'