Cherry-pick of 3 commits from PR #22#273

esben wants to merge 3 commits intooe-lite:masteroe-lite/base:masterfrom

esben:diorcety-improvementsesben/base:diorcety-improvementsCopy head branch name to clipboard