Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread