Fixed a small bug preventing the merge of two export config section.
Merge remote-tracking branch 'origin/develop' into develop