Merge "Add new simplified lunch function (lunch2)" into main