Merge "Add factory methods for async Handlers" into pi-dev