[CB-4286] rearranged