Merge "ART: Refactor GenSelect, refactor gen_common accordingly"