Merge "NONRTRIC - 3PP dependency version update"