Merge "Fixed sonar issue of EPFusionBaseController.java"