Fixed a bug 'cannot encode masked'
Fixed a small bug
Added support for counting combined operations
Merge remote-tracking branch 'origin/d4-cmu' into d4-costmodel