Merge "Update API to only modify specified inset types" into main