Merge branch 'dtypes_bug' into diff_dtypes_bug