Merge "Fixed ASK_ON_ERROR functionality inside retry steps"