Merge branch 'v390-fix' into v391-fix