Merge branch 'feature/membrane' into develop