Merge branch 'v393-fix' into b39-fix