Fixups for lambda b73.
Merge branch 'master' into internal