Merge remote-tracking branch 'origin/uat' into dev

# Conflicts:
#	_TMP/coverage-results.md
#	helm-chart/Chart.yaml
#	pom.xml
#	src/test/resources/integration-test/output/result.html
#	src/test/resources/integration-test/output/result.json