Support changes in Core + support forced tile size