Merge "Reinstate access to a forgotten member" into qt-dev