Merge branch 'feat/148-ubi-refactor-policy-component' into 'develop'

Feat/148 ubi refactor policy component

See merge request !229