CDN-250 and 252 bug fixes

Change-Id: I37912f5ef12a6a32237250ccec52337a7ba533e3
Merge "CDN-250 and 252 bug fixes"