add test
Merge branch 'release/phase-2.0' into SWET-1000-TEST
Merge branch 'SWET-1000-TEST'