am 1cd88e3e: Use framework scheme definitions

* commit '1cd88e3ecfa72f43c3fe25c912d9f67848f11e60':
  Use framework scheme definitions