am 4ab74e8b: Merge "ART: IRT refactor"

* commit '4ab74e8b26b8f860f6c39f04ed0a5830bf9823d4':
  ART: IRT refactor