Merge from 3.5.0 for issue #24492