CAL-668 fix build test failure reduce critical sonar issue
CAL-668 merge fix branch