Merged 3.4.94 into nightlies