Merge branch 'stable-6.4' into stable-6.5 * stable-6.4: Checkout: better directory handling Change-Id: I68e11fb06a354961f4146de51d326b69be5b69d3