Align lake on GP with latest changes.