Upgraded to Rail 2.3.18
Merge branch 'uat'