Added updates from patch 17.
Merge details
changed title from Patch 17 updates to Issue #3210116 Patch 17 updates