MERGE FROM THE DEVELOP BRANCH: Fixed the exportation data with some dates. Ticket #1455