02394 specific changes.
02619 changes