resolving conflicts between master and multiseq branches ahead of merge
adding mem_free parameters to various components