Merge remote-tracking branch 'jaimeMF/format_selection'