Adding official_code order see BT#8697