STRATOS-529

Signed-off-by: M. Isuru Tharanga Chrishantha Perera <isuru@apache.org>