case-3973 - Ding collection styles
Merge branch 'case-3973' into development