RCD-346 initial commit