Merge "Release 1.8.4 maven artifact"