Merge "Add feature flag for flagging manifest entries" into main