Prepare for enhanced NO_CHECK merge