avivamei

Relates to: #2804 ### Expected Behavior Provider should apply successfully ### Actual Behavior Provider fails during apply with error: Provider produced inconsistent result after apply When applying changes to ,...