DNN-3619 - merging vNext with developemnt