[support] Updating D6 to 7