case-3469 - Small fix for rotated items
Merge branch 'case-3469' into development