Update from original into fork (branch: heurakles)