merge beta into v2

2 jobs for !57 with topic/v2/test-license-checker in 26 seconds (queued for 25 seconds)
latest merge request