Merging updates from master to 2.4dev

Merging updates from master to 2.4dev