Agreed. But trying to keep it in sync with community version. Will fix it i community and apply the same here.