Merge "Avoid unnecessary dup"