Merge "Clear data from failed commits and recommits properly." into rvc-dev