Merge minor change