Revert "Manual merge of ItemsDemo to master"

This reverts commit 4ae0406758e19b0df60cc8182269febb83fbc841.