Merge "Add Extra Business Logic support" into pi-dev