Merge "[API feedback] fixed API for NR"