Merge "Fix warning: overriding commands for target"