am 174943b3: Merge "fix more brokenness" into klp-modular-dev

* commit '174943b39dd8a2fa3aaed50220304d77f3546333':
  fix more brokenness