Merge commit '4.4.1_r1' into HEAD