Merge "Use correct position for item decorator" into sc-dev