Replace Session
with RecordingContext
#1983
Merged
Session
with RecordingContext
#1983