Feature/rebase kregen2 --> develop

Feature/rebase kregen2 --> develop