merge from eucadev upstream into my fork, master branch