Fix internal inconsistency exceptions caused by cell updates#2195

rph8 wants to merge 1 commit intoxmartlabs:masterxmartlabs/Eureka:masterfrom

rph8:masterrph8/Eureka:masterCopy head branch name to clipboard