fixing issues
Merge remote-tracking branch 'upstream/master'
ramjith merge issues resolved