Merge "Add forgotten API flag" into main