Merge branch 'datarest' into datadav
measurement rest finished