This should now be fixed as part of BVERSION-71 The logic to handle changes has been modified This case should not be possible any more