SLX- 236 | fixt slx-231 and slf-267