@michaelzangerle should this be done before merge? can this destroy other features? if not please create an issue for that!