This is still being discussed. Should we wait for this before merge? Or can we merge and fix along the next days?