Merge branch 'release-17.2' into develop
updated isShownAt to parse array (7611)
Merge branch 'release-17.3'