changes by chanaka jayasena STRATOS-338