Merge latest updates from source repo - 2nd try.