Getting ready for C#7A0005