updates and merge 1
merge 2
merge 3
update tp 4.2
downgrade Jeffery way to 1.1 from 2.6.*