Merge branch 'release-1.8.4'
Added steps to resolve a merge conflict during bump done
Version bumped from  1.8.4 to 1.8.5
Merge branch 'release-1.8.5'