Code

Merge branch 'cb/assume-unchanged-fix'