Merge "[NR] Remove unnecessary boolean change, update var names"