Merge "Improve appearance of export file path" into lmp-mr1-dev