Merge "Move split classes back into Shell" into udc-qpr-dev