Merge "Revise logging in session classes" into udc-dev