Merge upstream: 9eeee04f983a - support modified response in CVS 1.12.13
Merge upstream: 618ee0147522 - fix entries backup created in source dirs
Fixing bundle exceptions on building messages