Merge branch '3.4.1_Release'