[1.3.4] Fix #2815, #2855 

Fix #2815 
Fix #2855