40-06-AcceleratedModMerge-NoReview

Raws of 40-06 merged with 34-11-AcceleratedMod Changes