Merge change 22632 into eclair

* changes:
  Alias rules properties names update