Merge "Update to the BitVector Implementation"