Merge dev-study