Merge "Handle backup transport registration dynamically" into klp-dev