Cherry picking seagirl patch into latest master.