Merge "update attachment projection column offsets"