awulkiew Merge branch 'develop' into fix/mkaravel_setops