Merged into 4.4.4 - r2