⚠ This MR is marked as WIP until the solution is tested by the team (I'm unable to reproduce it on my device)