Bug-fixes:

 - Back-porting fixes from Port-2.2.x