optimized the loop over the int_fields, bo9ol_fields and map_fields
Merge remote-tracking branch 'origin/feature/ffn' into feature/ffn to get up to date with changes