Finishing bugtesting of 3.4.1