(7.1.0) Failed CLI batch command with "deploy --force" for replace deployment

Case: 01633809 - Error while deploying using JBoss CLI
Using 'deploy --force' command on CLI batch mode fails and returns an error message: "Request is missing the address part."

 jboss-cli.sh --connect --controller=127.0.0.1:9999 --user=admin --password=xxx --file="deploy.cli"

batch
deploy --force ./jboss-ejb-in-ear.ear
run-batch

However, it's working in "EAP 7 CLI interactive mode" and "EAP 6 CLI batch" without error.

There is no adding "address" key in buildDeploymentReplace() of DeployHandler like below.
Even though on CLI batch mode it validates existence of "address" key in request with Util.validateRequest(), when 'run-batch' command execute in org.jboss.as.cli.handlers.batch.BatchRunHandler.doHandle()

-------------------------------------------------------------------------------------------

• First deploy: add by org.jboss.as.cli.handlers.DeployHandler.buildDeploymentAdd()

  {
      "operation" => "add",
      "address" => {"deployment" => "jboss-ejb-in-ear.ear"},
      "content" => [{"bytes" => bytes {
      ...
      }}]
  }
  

  -------------------------------------------------------------------------------------------

• After deploy: replace by org.jboss.as.cli.handlers.DeployHandler.buildDeploymentReplace()

  {
      "operation" => "full-replace-deployment",
      "name" => "jboss-ejb-in-ear.ear",
      "enabled" => true,
      "content" => [{"bytes" => bytes {
      ...
      }}]
  }
  

  -------------------------------------------------------------------------------------------

• Expected by org.jboss.as.cli.handlers.DeployHandler.buildDeploymentReplace()

  {
      "operation" => "full-replace-deployment",
      "name" => "jboss-ejb-in-ear.ear",
      "address" => [],
      "enabled" => true,
      "content" => [{"bytes" => bytes {
      ...
      }}]
  }
  

  -------------------------------------------------------------------------------------------