Merging in AutoMocking Branch - Based on params branch