Updated #JC-1512:
-refactor code according to CR
Updated #JC-1512:
-refactor code according to CR