Merge 3.5, issue #27194