Merge "BUG-2470: add trace of failed modification"