fixed order in public table CDB-2099
Merge CDB-2099 into release/2.12.0