Merge "Mark deprecated APIs, support column greylisting."