Merge "Fix for test-art-host"