Merge changes from topic "lambdaHandling"