Adding FULL SQL for 2.1RC1