Sync with stable and merge loos' patches.