Merge "Define ChangedId for App compatibility" into main