Bug-fix:

 - Back-ported fixes from Port-2.2.x