Merge case handling table changes from 3.0 to HEAD.