Handle with multiple fields on a signle bundle.

#1426 

This PR handle when a bundle have two file fields.