Merge "Pass "access_point" server to get_remote_client"