Merge branch 'memb' into 'master'