updated Tonic source to the latest in Tonic development branch