Merge branch '534_federation_targets_reachability' into 'develop'