Merge branch 'v392-fix' into v393-fix