[wip] Intern 1.6 Update