Merge "Add WITH_ART support to product definitions"