my changes
Merge branch 'VAS-Application1'