TK1648 (MY22) upgrades