Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels"