Merge fix - membership api - merged incorrectly from 4.4 to master