Bug-fix:

 - Back-ported from Port-2.2.x branch