Merge branch '20-refactor-cridge-cr-deletion' into 'develop'

Merge "20-refactor-cridge-cr-deletion" into "develop"

See merge request !20