[V23] Rails 3.0 porting

rebased #516.