Merge Membrane and master branches