Fixed in master by b68212f539f206679580afbfd008e7d329c9cd31. Forwardport of 290c9d665490d80b0a1b648fb022190d7dc375fc from stable/1.8.x
Fixed in master by b68212f539f206679580afbfd008e7d329c9cd31. Forwardport of 290c9d665490d80b0a1b648fb022190d7dc375fc from stable/1.8.x