To be clear... I am inclined to say that this should be rolled back on master (5.2) and not applied to the other branches either.