Initial changes for 10.1 compatibility and Q10 UI support