am 9ed8be67: Merge "Fix structural class checks"

* commit '9ed8be67ba26633007c6d96c2bc8afcbc89fc0d2':
  Fix structural class checks