7 points imported from sibernetic
Last changes from work with membranes porting