Merge branch 'shared-clean-up' into 'master'

shared: clean up and refactoring

See merge request !15
1 job for master in 8 minutes and 24 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #31466
allowed to fail
code_quality

00:08:24