Moved the lambda.
Merge branch 'source'
Rebuilt header.