Porting 4.2 done
Clean state :)