Merge "Improve dotdot workaround when src begins with '/'"