Kruland integration

Merge for next release.