PAHMA-930, PAHMA-926, PAHMA-811: fieldsets in KIR/OIR, handler update, object count now updates.