21ba9b1ebed88747822b357cc7a17febac75ac97  tk3.6.diff