Reopening this, as we are currently discussing solutions with the ES team. We probably won't be able to solve this soon, though.