FRBEV-12 - Moved functionality from setData