Merge remote-tracking branch 'jaimeMF/merge-formats'