Merge branch 'fix-variable_watch-reallocation' into release