User story RICPLT-2620