Comment pre-merge