Merge remote-tracking branch 'origin/lucca-tests-bench' into lucca-tests-bench