merged  1.3.4 changes