Merge of session manager changes