Merge "Add BOARD_GENFS_LABELS_VERSION" into main