Merging updates from master

from master updates