Merge branch 'revert-730112f3' into 'development'

Revert "Merge branch...

See merge request !133