BZ-1162137 - Limit the number for all fields constructors