Merge "Change expansion to be a lambda" into main