cherry picking fixes