Merge with velpt_dev branch