Merge branch 'master' into develop
Passed
created pipeline for commit
045459c7
, finished
1 related merge request: !1712 fix master/develop merge conflicts
6 minutes 27 seconds, queued for 1 seconds