Hot fix JBJCA-996 to branch 1.0

cherry-pick the commit: a5a311974827bf320e54c1634b89ac848e4196d2 to branch 1.0