Issue refactor convergence sessions 2021-05-13