Merge "Fix assertion failures caused by different instance type"