Merge Changes from Master after 8.0.0