Merge branch 'patch/JAL-4195_cli_eps_export_npe' into develop