[3.8] Fix #1609 & #1608