Merge branch 'master' into 'fix_harcoded_testing_loop'

# Conflicts:
#   pom.xml
5 jobs for fix_harcoded_testing_loop in 4 minutes and 23 seconds (queued for 1 second)
latest