Should fix (or actually - behave gracefully on) #EA-74003, #EA-74493, #EA-76032, #EA-76529, #EA-81295 Tests added Original commit: 1614aca48e
1614aca48e