Eng 6948 upsert preparser