Merge "[NS A11] Small refactor"