Add update with features revert and variable set #5161