Merge "Move RCS table creation flag to contract class"