fix: merge conflicts

5 jobs for 86-add-new-additional-field-in-platform-status in 1 minute and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Lint
passed #1021899
docker
lint

00:00:38

 
  Build
passed #1021900
shell
build

00:00:33

 
  Test
passed #1021901
shell
test

00:00:16

passed #1021902
shell
test-js

00:00:35

 
  Tag Docker
passed #1021903
shell
tag_docker

00:00:09