Because there is not much time for us to test this further, I'll postpone this change to 7.1.