1310 fix (cube merge)