merge from main eutester into my fork, testing branch