Committed latest updates from master