Merge branch 'v391-fix' into v392-fix