Issue #4910, patch 3/3:  rename nb_long to nb_reserved
12 files changed