Merge "Fix functional issues after nosdn deployment"