GCP-7419 MAJOR CODE CHANGE TO SESSION REFERENCING