Merge branch 'dev_vald_fe/data_tag' into 'develop'