[support] Converting to D7