Merge latest fixes
Merge latest fixes