[SAMA-849]

[SAMA-849]