Merge branch 'develop' into 4-fix-rulesintegrationtest-unit-test

2 jobs for 4-fix-rulesintegrationtest-unit-test
in 1 minute and 17 seconds, using 0 compute credits, and was queued for 2 seconds