Merge branch 'fix-chebop-inconsistency' into development