merge dev-2