Merge "Reinstate access to a forgotten member"
am: ab6ab9e4d4

Change-Id: Iad9203323f33a5f25ff080e21d046030e2a9be64