[Q] applying m10 changes