CYKLO-987: expanded organization data model
CYKLO-987: added a method for recovering from failed update
CYKLO-987: rollback a failed update
Merge branch 'dev' for release 2.26.6
release 2.26.6