update custom blocks

[Roger-luo]

since T is removed, blocks definitions need to be updated. once related PR are done we could checkouted a branch and fix the version, so old code depends on previous implementation still works.