Merge branch 'revert-e0de0fcf' into 'develop'

Revert "Merge branch 'object-creation' into 'develop'"

See merge request !810
2 jobs for develop in 3 minutes and 42 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #16482
lint

00:01:12

 
  Test
passed #16483
unit-testing

00:02:29