Merge "Remove observing offset in composition" into main