[DEL][AVN-118] Undo state Creation

Merged Luciano Ortiz requested to merge 15.0-fixes into 15.0-stage

Merge request reports