Merge "Properly save and restore skip related variables" into nextgenv2