Updates for 4.2.x and some tweeks