Enhancement:

 - Back-porting changes from Port-2.2.x