Merge branch 'reduce-cmState-accumulation' into release