CBLT-252: UNDO experiments, restore commit:  7b239ee75d2c92fd72d59cd19b8808f5b7a35508

Change-Id: Ice2803fa316533105e8b6605b62efb44666fbfdd