[V24] Rails 3.2 porting

rebased #489.