case 1998 - Arrow is added to facets.
Merge branch 'case-1998' into develop