I tried this with the master branch and it seems like its working.

Some questions:
1.) When is Kirkstone planned for release?
2.) Are these bugfixes backported to Honister and Hardknott?

Thanks a lot!

Nico