Rebased on 6cf00e6cdec63d141cfc716446b8c0eac464ab36.