Merge "EPAppServiceImpl class fix."