DEVSUPPORT-1109 - modify to follow rif-cs schema version 1.3