Commit 8af8b70d authored by Carlos Alfredo Yeverino Rodriguez's avatar Carlos Alfredo Yeverino Rodriguez

Merge branch 'master' into 'revert-e86f9476'

# Conflicts:
#   pom.xml
parents da5ffefd 51517fba
Pipeline #106960 passed with stages
in 2 minutes and 28 seconds