GONRG-5764: resolved conflicts

8 jobs for !687 with auto_release_2022-10-13-T12-50-54 in 5 minutes and 28 seconds (queued for 1 second)
latest merge request