Merged v1.61 into fix-chained-waiton