issue #19314: Merge item site support to master.