Bug-fix:

 - Back-ported fix from Port-2.2.x