merge 3.2 (null)