CSH-1569 #time 10m #comment tag data model version data into persistence