Made sam_207 actually build after merging from next with secondary indexes changes.