Context fragment of contained single entity (#2009)

Context fragment of contained single entity (#2009) #2172