Port commit ec905ef825521fc5d5ec69ca8b8b1de22f6606f6 from master to 0.97