Arts changes
Merge branch 'master' into chowk-arts-fixes