modify according to the comment
Merge remote-tracking branch 'henry/source_preview_page'