Merge 9.4 beta 3