Merge "Factor out preview parse"