Merge "Add feature requirement annotation" into main