Merge "Rewrite ORMTable::unprefixFieldNames"