GA-696: Sunny

Owned by TadpoleSS4