build: R22 and TC change