4.2.014 branch w/o hacky stuffs