Merge "ART: Refactor frontend.cc"