Cherry-pick 4.4

Cherry pick last bugfixes from mater