Resolve merge from 4628