[ #46000 ] Handle case where the IP2IP account is not the first one
[ #45529 ] Add a new enum_class_size method, replace the old static_cast everywhere