Update to latest changes from internal version