*8265* introduce application method for context column name
fix SQL for upgrade, reconcile with context column name change