[RICPLT-1832] - Rnib module changes + unit tests. After code review

No match.