Merge in changes from the main stream

Merge in changes from the main stream - get all latest changes