Hey I think there are some issues in this PR as you already illustrated in the scenarios. So are you going to merge and deploy this?