rebasing attr_column_mismatch_bug onto master