Merge "Add refactoring annotations to NSSL functions."