(cherry picked from commit 5d5a22a878)
5d5a22a878
(cherry picked from commit 2d7363b273) Conflicts: pom.xml
2d7363b273