[V21] Rails 3.2 minimal porting

rebased #792.