Merge "Remove blueprintId in loop"