Merge 1.2 changes to ArtsW

Merge 1.2 changes to ArtsW