Merge latest request

Update to mainstream