Merge "Refactor ref mv stack system" into nextgenv2