Merge "Fixed member access into incomplete type build error"