Merge "Add connection before resetting state of sibling connections" into lmp-dev