Selective Exporter branch merge