Merge branch 'merge-item-shadow-floor'