Dev feedback connect

1. https://github.com/geoadmin/mf-chsdi3/pull/27 Merge in chsdi
2. Update chsdi
3. Merge in geoadmin