Merge "ART: BitVector and Optimization changes"