changes by sajjad
Merge branch 'master' into scms-sk
change