Merge remote-tracking branch 'origin/export_improvement' into dev