Merge "getSessionCharacteristic bug fix" into main