Merge branch 'feat/112-ubi-refactor-policy' into 'develop'

Resolve "(UBI) Refactor Policy"

Closes #112

See merge request !197