Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev