Merge wrong resolved changes from 2.18.5