Resolve #14026 (Merge from 3.2)