Merged official rails v2.3.17 to re customised fork (at v.2.3.16)