(cherry picked from commit d60f66c5)
added 2 commits
Compare with previous version
enabled an automatic merge when the pipeline for edadf522 succeeds
merged
mentioned in commit 8b2674ea