[JKSF-485]

[JKSF-485]