HEMERA-3244: Some work
Cleanup of some unused adapters
Merge branch 'HEMERA-3244-layouting' into develop
HEMERA-3244: Layouting basis
Merge