Features/create client rebase tryal

Andi Staub requested to merge features/create_client_rebase_tryal into develop

Created by: nuritnt

because of trouble with probable overwriting of thhings on the original pull request a new one

Merge request reports