Merge "Rework cell functions in novav21 state"