Merge "Introduce Content, ContentKey and ContentScope (1/2)" into main