Backported Cell vmerge fix from master for use on project that needs 2.8.1.