Merged some updates from master

Merged some updates from master