fixes #584 - merge FB for RPC new REST