Merge "Fix duplicate artifact inclusion"