Merge latest changes to ArtsW Version

Merge latest changes to ArtsW Version