Could this help? https://github.com/rails/rails/pull/5286