[RICPLT-1899] - RNIB improvements