Merge "Modify lambda type computation" into ub-jack