Merge branch 'mt/patch-id-stable' into jch