Bug 577894 - Backport Bug 577341 from 4.22 to 4.7 Change-Id: Idfb9350b384ca4131827415ea10d3e293e0312aa Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/189092 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>